Merge "Unhiding render target code for renderscript"