Removing some obsolete flags

Change-Id: Id33e28ddd7341d2b494c4b2a294663091afdb157
2 files changed