Merge "Fix 64 bit compile failures in renderscript"