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

Change-Id: Iaab1d98a8096204be8f8153f53074cb772f0e809