DO NOT MERGE ANYWHERE - Update master-dalvik-host to use main branch. Bug: b/289400079 Change-Id: I55a43f2da514ae634805b74330c599d7a05550ac