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

Change-Id: I9673339b1d18bdc0e0ff564cf18d4bfc1f628394