Merge "Camera: fix an issue regarding ndk/vndk availability callback" into main