Merge "Revert "Stop building boot-debug-*.img for GKI"" am: 8681e5ac2a am: 93152fc87a am: b6e0edf835

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

Change-Id: I48004dbf332c3aaf79ce89048ded366f68870de5