Merge \"Fix misc-macro-parentheses warnings in LegacyCamera.\"
am: 02301db045

Change-Id: I0dfa52fa470876beb8248397352a1ec299f4bb41