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