Merge "Merge aosp/master-ndk to aosp/master" am: 36ef3defe8 am: 1bf420a789 am: 259f181dd8
am: 65d55f13c6

Change-Id: Ic5c8806ac59d4ca6e1c2c9f22f20b5086fb2b937