Merge "CameraNDK: hide hidden enum values" into nyc-dev