Merge "SurfaceControl ndk-jni API review"