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

Change-Id: I77c7b3496a94460d7bb1ee621e0411df62a1d75b