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

Change-Id: Ida8cc5a6d17b526ff4f5af5f2406930333a385c8