am e14102df: am 80ca0ea4: Merge "Multi-device support for vm-tests." into froyo