am 6917606e: (-s ours) am 6daf70b2: Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev

* commit '6917606e04091035bc963e1b88665f6b83b9970d':
  Camera2: Selectively re-define master metadata symbols: DO NOT MERGE