Merge "Update path to camera ndk headers"