Remove old flags no longer used

Change-Id: I13a7396044b2276aedba9f17901eabeeff71bf6c
Merge remote-tracking branch 'cm/cm-11.0' into ose