Clean up some old (pre-aconfig) flags.

These have been enabled for a long time and are safe to remove.

Fix: 270394392
Fix: 270394041
Flag: NONE removing an old flag
Test: everything still works as expected (no-op change)
Change-Id: Id5fc356a29a7e85324a8c3f922709251f371b2c5