Merge "Added protections for RenderScript VTS tests." into oc-dev