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

Change-Id: I40006b057ab430cdb7bb76b6b2a14ab40778833a