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

Change-Id: I03e7a64f197e7b47f7f7dbcd893cc3125fc06850