Merge \"Fix misc-macro-parentheses warnings in dalvik.\"
am: e8708a3314

Change-Id: I7184c2d11610f2677d2accf9ea5e43ab07d633f2