Merge "ASurfaceControl: add SurfaceControl to NDK (1/2)"