Merge "Fix linker veneer for aarch64 in renderscript"