Merge "Fix misc-macro-parentheses warnings in aapt and androidfw."