RenderScript VTS cleanup and fixes
am: da8c2c1e2a

Change-Id: I41227692b20c8833134b0130d1ff90d650cf29d9