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

Change-Id: I4b2bc593082ee4179adccd5868696a50d687cb0c