Merge "Camera2: Fix metadata symbols"