Merge "Add missing support library projects to pathmap" into mnc-ub-dev