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