Merge "Added protections to RenderScript VTS class teardown." am: 80002c1ff3 am: 06f79dbd05 am: 88d9fda69a
am: 5cc58a7699

Change-Id: If28246fe60aa1f3cf24da4c4668cc91b347abbbc