Merge "Remove pathmap.mk entries for libc."