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

Change-Id: I767fc5aaeafba536d20abbe1493fc7605cc1c944