Merge "Disable macro redefined warnings."
am: d37ce77ebd

Change-Id: I0e644400c4d7a487d5676b5705a650c8e185ec3a