Merge "Added protections for RenderScript VTS tests." am: 792ec065e0
am: f251028320

Change-Id: I60ad212ce37b90e65ae034e5080cee8bc44e9185