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

Change-Id: I211e1f18f8b35cb7826ae5d390074c520c2ffcc4