Merge "Remove some potential test flakiness." into dalvik-dev