hammerhead: Remove deprecated flag

Change-Id: Id52576dd2262eca00292a90511245445dab2ae08
Merge remote-tracking branch 'cm/cm-11.0' into HEAD