Merge \"Fix misc-macro-parentheses warnings in libnativehelper.\"
am: 534583b50d

Change-Id: Iafb26a33ea0d6c45662ff10e15cd85dcbbbc33d5