bump(update_engine): include the oem/machineid code

This commit also gets all of the tests running (after removing some broken
ones)