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

Change-Id: Idcfee4f46c7649179be04b08e173c09cff485bf9