Merge "Remove two -D flags for unused macros."