Merge "dalvik: Accept custom --vm to a degree"
am: 9809f45fa7

Change-Id: I644f83ea27d82fa67be351f4d2423fea96723e9c