Revert "switch to ART and remove dalvik"

This reverts commit ee10ac77026c795288853ff9570e2e915f6ef8b5.