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

Change-Id: If24ecdf47738b7ce27d889daacc39c8291b45037