Simplify feature flags

Bug: N/A
Test: TreeHugger
Change-Id: I386efb692907835658a0772c25e91a6eb3b622da
2 files changed