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

Change-Id: Ic1fd982ccb6f33c918946a3d72b4cddcc711ca2f