cwm: Use pathmap for recovery

Change-Id: Id358db393f4f945b3f5c91419827666f3e70127e
Merge branch 'cm-11.0' into kk_mkt
Merge remote-tracking branch 'mokee/kk_mkt' into HEAD