Merge "Fix misc-macro-parentheses warnings." am: 8558b8c809 am: e3c2155db8 * commit 'e3c2155db8e4b3a01a44d4949e32a0bb032ec6d5': Fix misc-macro-parentheses warnings. Change-Id: I42a4833a71303d939341c272f225a983c9d1165b