Merge "Update pathmap.mk for renderscript support library migration"
am: cafc7efee0

Change-Id: Ic85e61e12524b46073a0fd3b092eb42bc6d5c283