Merge "Add missing support library projects to pathmap" into mnc-ub-dev
am: 5b30101722

* commit '5b3010172211583034d1cf5eac41583dae79d77a':
  Add missing support library projects to pathmap

Change-Id: Ia5c43c59bd4ff26a2d1069f38205ee7a5de2181b