Merge "dalvik: Accept custom --vm to a degree"