Merge "Don't hide NDK types behind API level guards." am: 37dc3d2136 am: 23ac59ad8d am: d32aab8c29
am: 89224466a6

Change-Id: I32760fae1179927e7f2772f50c44cbfc9fb24466