Merge "Revert "Let gsi_arm* products build mk_combined_img"" am: 3d8ca6c8ed am: c099242c55

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

Change-Id: I082d4750f00f2e6f5c91dd4a56d1bf4ca07f78ec