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

Change-Id: I1539ef5d56ec6070f135a21a75f18862691233be