Merge "ART: Refactor run-test 983 dex verification" am: 0694a55278
am: 929c74c75b

Change-Id: Ia5fcea7a82365b4c69fe744470590d1946f5dfcf