Merge "Fix the ISurfaceComposer onTransact switch."