[automerger skipped] Merge changes from topic "am-33761c75a1d240df8af3b3cd1fd22513" am: 8ef77d1ec9 -s ours am: a397a3f55e -s ours am: e8bcd8101e -s ours

am skip reason: Merged-In I58432a055843e851137bced523aa52ec32d63d0f with SHA-1 51c0301f9f is already in history

Original change: https://android-review.googlesource.com/c/platform/external/dexmaker/+/2037244

Change-Id: I5968970ee9f347e59bf836c1a241094e882b4823