tree ecb5beb03bf1a7638283c71661370c00cae84fc6
parent 7b52a74b787ea5f1dd669a48190f2d222ccad21d
author Xin Li <delphij@google.com> 1690821124 -0700
committer Xin Li <delphij@google.com> 1690821124 -0700

DO NOT MERGE ANYWHERE - Update master-dalvik-host to use main branch.

Bug: b/289400079
Change-Id: I55a43f2da514ae634805b74330c599d7a05550ac