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

Change-Id: I66fef67777bd2711c7d19d41fdd9120509e879ad