Merge "camera: Fix incorrectly generated ndk enums" into main