Merge "Camera2: metadata spec update for reprocessing"