Merge "ART: Make ahat tests depend on the right dalvikvm"