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

Change-Id: Ib8bc975063564100258bef9f805aff6e6832db56