tree fbdaab19dd0aa5f0cadd85ce716f16d143fd3582
parent c1fcdf1ec5a8c5ffaf9e857ea81ac7358d1df7f5
author Elliott Hughes <enh@google.com> 1365729211 -0700
committer Elliott Hughes <enh@google.com> 1365729211 -0700

Port AOSP dalvik change 9e11a836e0927e6ea9246b56d99e0482920b81c6 to art.

The flakiness had already been worked around in art, but not backported.
The new dalvik fix is cleaner anyway.

Bug: https://code.google.com/p/android/issues/detail?id=54114
Change-Id: If21e493f3614a14fc5e645bf7055515b963832bb