Merge "Camera2: update reprocessing naming" into mnc-dev