Merge "Disable macro redefined warnings." am: d37ce77ebd am: 03f3f4ab42
am: e442f47d16

Change-Id: Ie84b8bc35e5a70f1c0b9f96ea3802dc4095bfa3b