Merge "Eliminate false negatives from ART 141-class-unload test." am: 16c6063084
am: 7c0f267da3

Change-Id: Ie3823a49fbcad8c0e681e558caff8b8b1f330a6e