Merge "Fix build error while creating CHD image" into main am: 3e031927

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



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