Merge "camera2 ndk: Fix enum values which were incorrectly auto-generated" into main