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

Change-Id: Iadeadf3ac15667c2426a871506b28a994672dc86