build: Fix pathmap derp

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