Merge "Disable macro redefined warnings." am: 0a9866d60b am: 9bbfd91413
am: a091d1cfbf

Change-Id: I2077cce88a448ed86bb85b39cba767f930a287e3