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

Change-Id: I4f7b74ab00e0c04da23874c4816a167abd0bd70e