Merge "Revert "Stop building boot-with-debug-*.img for GKI"" am: 52103ef144 am: 6c51e32ec0

Original change: https://android-review.googlesource.com/c/device/generic/common/+/1856261

Change-Id: Iba511d22e3a346eb555550e1309e9071a58a1a9d