Revert "Work around a art test script bug mixing up bootclasspaths."
am: e8e544dc89

Change-Id: I1ed7fdf913f68e47b2100ce03142ebb1bc946b64