Revert "Expect vdex files in a target-independent directory in t..." am: be50bc3e7e am: a4dc61a011

Change-Id: I105a5563195bc342ba55b643c76fb3ad6b367a46