Android o preview 2
Merge "Disable macro redefined warnings."
am: 3fd572943a

Change-Id: I9bb29b38c53adf95a4bbe3d577ccf7a0bf912b98