Merge "Refactor SurfaceFlinger::onTransact"