otterx: Use pathmap for recovery

Change-Id: I68e2b5e7d362c8942616fcccef3cb1a458ed4ded
Merge remote-tracking branch 'cm/cm-11.0' into cm-11.0