sr: Use pathmap for recovery

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