This CL also includes changes from https://chromium.googlesource.com/chromium/src/build/+log/483d96..f0fc706

Bug: chromium:1111223
Change-Id: I8ee1297eae93050d7ef615f01b388de982c88014
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2328790Reviewed-by: Liviu Rau <liviurau@chromium.org>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#69182}