Merge "unhide renderscript"