Remove a few more useless #defines

Change-Id: I211e9bcb1c37d0ebc108896f109b23ce915e22b4
2 files changed