Merge "Invoke dex2at before invoking art."
am: 0a8b3153ca

Change-Id: Ia33278daca7ff576c5f179d302df259241a371e3