Merge changes from topic "ndk-vendor"
am: 282566950f

Change-Id: I25fd62bfd3f161f76d5666309f112259e7657d87