Merge branch 'ng7.1' of https://github.com/SlimRoms/frameworks_native into a7.1.1-caf