Merge "GUI: Move Surface.aidl here and implement for native" into nyc-dev