cwm: Honor recovery variant

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