Merge "Move framework-specific portions of pathmap.mk into frameworks/base"