Merge "Camera2: fix metadata symbols"