Merge \"Fix misc-macro-parentheses warnings in Gallery2.\"
am: 67d7daa7b3

Change-Id: Id6627d6808aaaafa59d64161c685f5c89ee5d0b8