am 35aa1c14: (-s ours) am 4c3f8b38: camera: fix metadata symbols: DO NOT MERGE

# Via Android Git Automerger (1) and Igor Murashkin (1)
* commit '35aa1c14769acad1086349bb63fb290f577934ce':
  camera: fix metadata symbols: DO NOT MERGE