Merge change I5ff64f6f into eclair-mr2

* changes:
  Add CameraServiceTest.