Merge "remove CameraServiceTest which wasn't used" into jb-mr2-dev