tree e776cd65aee45d856b8d48fed9e3dca700dc091f
parent ecb76eb1e58da94893009effbde7ffbb7515f9c6
author Xiaoming Shi <xiaomings@google.com> 1607539083 -0800
committer Xiaoming Shi <xiaomings@google.com> 1607539390 -0800

Import Cobalt 21.master.0.292047

Includes the following patches:
  https://cobalt-review.googlesource.com/c/cobalt/+/5670
    by xingyz@amazon.com
  https://cobalt-review.googlesource.com/c/cobalt/+/5770
    by marccote@lab126.com