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

This reverts commit 52f92faa60d4e5300e194e6ded3d290fcf4df241.
2 files changed