Merge "Invoke delta_generator directly" am: 84031f7b am: 651e2a94 am: 766eaa6d

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



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