Merge "Camera2: Match updated camera_metadata methods."