am b9f3d31c: am fc2ceae7: Merge "Remove two -D flags for unused macros."

* commit 'b9f3d31ce40bceec4ecf86e2aaf83f1d8857f346':
  Remove two -D flags for unused macros.