Merge "Disable macro redefined warnings." am: 3fd572943a
am: 68460e6550

Change-Id: I2ab788b91292461be1610a8ee9e657bfe5b73038