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

Change-Id: I7aca5d67077ce7603b15a83c362fa516e9615b84