Update to match  CM: Use project pathmap

https://github.com/CyanogenMod/android_system_core/commit/f4921917ed300f921975f01d42648805bbf4f691