Merge "CTS vm-tests now depend on hosttestlib." into froyo