The following revision refers to this bug:
  https://chromium.googlesource.com/aosp/platform/system/update_engine/+/2e4eda58d2dd747680cfb519b31072027190370a

commit 2e4eda58d2dd747680cfb519b31072027190370a
Author: Amin Hassani <ahassani@chromium.org>
Date: Tue Jan 08 23:29:09 2019

update_engine: Merge remote-tracking branch 'cros/upstream' into cros/master

Since libchrome in AOSP is ahead of CrOS I had to guard against BASE_VER in a
few places to satisfy older libchromes.

file_fetcher.cc is now needed in delta_generator.

A few unittests need to be run as root.

BUG= chromium:916593 
TEST=unittest
TEST=cros_generate_update_payload
TEST=cros flash
CQ-DEPEND=CL:1399261

Change-Id: If3497549e88e559f8ecc38f414259b9c774f4a44

[modify] https://crrev.com/2e4eda58d2dd747680cfb519b31072027190370a/Android.bp
[modify] https://crrev.com/2e4eda58d2dd747680cfb519b31072027190370a/update_engine.gyp
[modify] https://crrev.com/2e4eda58d2dd747680cfb519b31072027190370a/payload_consumer/download_action.cc
[modify] https://crrev.com/2e4eda58d2dd747680cfb519b31072027190370a/common_service.cc
[modify] https://crrev.com/2e4eda58d2dd747680cfb519b31072027190370a/update_manager/evaluation_context_unittest.cc
[modify] https://crrev.com/2e4eda58d2dd747680cfb519b31072027190370a/payload_consumer/filesystem_verifier_action_unittest.cc
[modify] https://crrev.com/2e4eda58d2dd747680cfb519b31072027190370a/update_manager/boxed_value.cc

The following revision refers to this bug:
  https://chromium.googlesource.com/aosp/platform/system/update_engine/+/7438410328547d8f55b6555ebdcfd9768978fcb9

commit 7438410328547d8f55b6555ebdcfd9768978fcb9
Author: Amin Hassani <ahassani@chromium.org>
Date: Fri Jan 11 19:33:02 2019

update_engine: Merge remote-tracking branch 'cros/upstream' into 'cros/master'

Do another merge to get a few important very recent CLs.

BUG= chromium:916593 
TEST=unittests

Change-Id: Iee29b797270d8733838e755f9da0acaa405fd770