am 6daf70b2: Merge "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE" into jb-mr1-aah-dev

* commit '6daf70b26bfddf9ad079b925c0d586b789e3c207':
  Camera2: Selectively re-define master metadata symbols: DO NOT MERGE