Merge \\\\"Fix misc-macro-parentheses warnings in system/vold.\\\\" am: 786c536e84 am: c83c87e681 am: f5e9bc9517
am: efe8b3de96

Change-Id: I157cdbcf2e66ab5e992f653b4a1f9f5fc6520ffd