Merge "camera2: Formatting nitpicks."