Merge "RenderScript VTS cleanup and fixes"