Merge "renderscript API cleanup"