Merge "Revert "Fix retrofit OTA generation failures"" into main am: e41c75cb

Original change: https://android-review.googlesource.com/c/platform/build/+/3079786



Change-Id: I4412735014ebb52f7bee6a10c3f29a9a153d1ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>