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

Change-Id: I0cabe907b999e5ea14ec1ff3cebb739b99b6a764