Merge change 24283 into eclair

* changes:
  CameraService change for OVERLAY_FORMAT_DEFAULT