Merge "Fixed flaky RenderScript VTS Test" into oc-dev
am: d8e99f75cb

Change-Id: Iedc4ce15dcfec27da4e1b4df5057fd5ab3f8fcc2