Merge "Remove Support Library from frameworks/base pathmap.mk"