Merge changes from topic "ndk-vendor" am: 282566950f am: 82d1e10eb0
am: 55b7e6a30d

Change-Id: I030865b230555158a9396f4a78e20f2d30010cd9