build: Add alternate recovery to pathmap

Change-Id: I2827ace9729b6af8d5b4e637374ccd1e5902dd55
(cherry picked from commit 92ef9ad4e8ba8a5503866432929f6f59bbd06e83)
Fix the alternate recovery inclusion logic

Change-Id: Ifb59d61dae44dd639d7f891dc57bb326b06b1118
(cherry picked from commit d6cff8525c6f5c5bd3fbc16a1358e6868604c13d)