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

Change-Id: I639416cf9b5170c24f21014cca7c26a33a7b0e07