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

Change-Id: I11c5c88a879df5acb1051ed65ca3cc107108f8b9