Merge \\\\"Fix misc-macro-parentheses warnings in hardware/akm.\\\\" am: b459b8d1de am: 7201e557ef am: 37025e90a3
am: 7889f98849

Change-Id: I5b8c1756f2d793b75b32d1882eda16c0cf1a1bc3