Merge "RenderScript VTS cleanup and fixes" am: 7b36175068
am: 1a2850fbc4

Change-Id: I1c6e607430a4e597400f0a61a04b98840238567a