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

Change-Id: Ifb6fabf15f1e74fecfafe1f7854553083c544375