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

Change-Id: I54f89f274a755bcd0815c8437cb25cf1070e81f9