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

Change-Id: I72ad3f83a5707670f9abd87596682d8972847fe5