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

Change-Id: I8c709868b1a2ff5b3078b44bf740f4a1cd7899d5