RenderScript VTS cleanup and fixes am: da8c2c1e2a
am: 6b95bddebc

Change-Id: I3682f0de6f618cbc5a187e35656ec06ac435efb8