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

Change-Id: Ia12c48c93542aa9ca62377b033a2fed2d152d9b8