bump(update_engine): include the oem/machineid code

This commit also gets all of the tests running (after removing some
broken ones)
Merge pull request #446 from philips/add-oem-and-machine

bump(update_engine): include the oem/machineid code