Merge "Disable macro redefined warnings."
am: 0a9866d60b

Change-Id: Ieca574c841b5d73b991cd119878dcbf1f73781eb