Merge "camera2: Fix local variable names in rgb->ycbcr conversion."