tree 0077b57b1ef96c194380908311ce2a993fb1a89c
parent 99d570d67bd5dab11de321068c4002ab76ae774a
parent 694eeb0dece40f88e11ece3a776d995d855be79b
author Tianjie <xunchang@google.com> 1592551379 -0700
committer Tianjie <xunchang@google.com> 1594059876 -0700

Merge remote-tracking branch 'aosp/upstream-master' into merge

It's a merge from chrome OS with some reverts.
1. the fd watcher change, because the libbrillo version isn't
compatible in aosp.
commit 6955bcc4ffe4cc9d62a88186b9a7e75d095a7897
commit 493fecb3f48c8478fd3ef244d631d857730dd14d
2. two libcurl unittest. Because the RunOnce() of the fake message
loop seems to have different behavior in aosp.
commit d3d84218cafbc1a95e7d6bbb775b495d1bebf4d2

Put preprocessor guards to use the old code in aosp. And we can
switch to the new code in the other path after adopting the new
libbrillo & libchrome.

Test: unit tests pass, apply an OTA
Change-Id: Id613599834b0f44f92841dbeae6303601db5490d