Merge "Clean up code duplication in build_image.py." am: 514ec3b59a

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

Change-Id: I4a4c4ae1da019534d0aa670fdddae0197fb98c52