am 9dd73dd2: Merge "remove CameraServiceTest which wasn\'t used" into jb-mr2-dev

* commit '9dd73dd2634d41766e6cfd67edd96a018a8ad7d7':
  remove CameraServiceTest which wasn't used