Merge "Update pathmap.mk for renderscript support library migration"