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

Change-Id: I99cf61b4953f53f349518b64ad1c84d3e3de7037