Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread