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

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