Merge "ART-tests: Remove DX dependency from 646-checker-hadd(-alt)?-(short|char)"
am: fd664eab23

Change-Id: Iceef417a452eb4f776b04261f4e8412cafe7d548