Merge "Use pathmap.mk for system/media includes"