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

Change-Id: If4737edc7d976a28f0cdb286e7c2af169ecb7691