am 28ecf8da: Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE

# Via Igor Murashkin
* commit '28ecf8da880d2371e9b995a08c79dd7efe74ca34':
  Revert "Camera2: Selectively re-define master metadata symbols: DO NOT MERGE": DO NOT MERGE