Merge "Disable macro redefined warnings."
am: adfafa5ba6

Change-Id: I8d40c441b32d3450b517be144839fce5cc48e22c