Removing flag overrides. All flags should be defined as togglable flags instead.

Change-Id: Ia7b9ff84413096cd5b0c4a9a81a232019f2522d2
25 files changed