apq8064-common: Use pathmap for recovery

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