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