build: Add alternate recovery to pathmap

Change-Id: I2827ace9729b6af8d5b4e637374ccd1e5902dd55
Fix the alternate recovery inclusion logic

Change-Id: Ifb59d61dae44dd639d7f891dc57bb326b06b1118
Merge "build: Add alternate recovery to pathmap" into jb3
Merge "Fix the alternate recovery inclusion logic" into jb3