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