Merge "Disable macro redefined warnings." am: adfafa5ba6
am: 5a011224da

Change-Id: Id0749c08f9146633660931c5e173eccefb84c1e7