Merge "SurfaceComposerClient::[set|get]DesiredDisplayModeSpecs use aidl type"