Use the correct recovery variant

bacon is fully tested with CM recovery... :)

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