Merge "Camera2 tests: Update paths to camera service"