Merge "dalvik: Accept custom --vm to a degree" am: 9809f45fa7 am: 003056143e am: 3075439533
am: 15bc1ab706

Change-Id: I3e7dae17b299752ddad5bf8469c652dd26735271