Merge "Camera: Update NDK for activePhysicalId metadata"