Merge "Camera: Fix broken ndk link for synthetic extendedSceneMode keys" into sc-dev