Merge "Camera: fix CaptureResultTest codegen" into mnc-dev