Merge changes from topic 'libandroid-ndk_headers' am: 00a19a37db am: c2c9caa71e
am: ca68d73d58

Change-Id: I25c030fa891ebd199c68128457722a33cf2967fd