Merge "Rename private methods in CameraTest to not start with 'test'."