Merge android-platform-art (10.0.0+r36-3) import into refs/heads/workingbranch
authorHans-Christoph Steiner <hans@eds.org>
Thu, 7 Jan 2021 12:08:42 +0000 (12:08 +0000)
committerHans-Christoph Steiner <hans@eds.org>
Thu, 7 Jan 2021 12:08:42 +0000 (12:08 +0000)

Trivial merge