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

Change-Id: Iff3c1991d733a2314bd961a3ec89c0631227c217