Merge "Migrate 13 methods of ISurfaceComposer to AIDL"