am 4707dc73: am 72abf01a: Merge "Fix the ISurfaceComposer onTransact switch." into gingerbread

* commit '4707dc73e236b7055644401b73cd30164b7ad157':
  Fix the ISurfaceComposer onTransact switch.