Use project pathmap

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