hammerhead: Remove deprecated flag

Change-Id: Id52576dd2262eca00292a90511245445dab2ae08
Merge branch 'cm-11.0' into kk_mkt