Merge "Added protections for RenderScript VTS tests." into oc-dev am: 59bfe719d2
am: 841c9a9f35

Change-Id: I98ad95d36c16ff05acee182297663032d0332ecd