Merge "Add cameraservice_test to device-tests"