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

* commit 'c608284d22b95733e6b3a24f84084d9268eeabdf':
  Add missing support library projects to pathmap

Change-Id: I0e2d265dbdde5ec6d8c5c5588e5a8e505be46c74