Merge "New NDK APIs for SurfaceTexture"