Merge "API cleanup for renderscript. This will be a multiproject commit."