Merge "Let gsi_arm* products build mk_combined_img" am: b77b1a6291 am: f210731b12 am: fdcf9d6fff am: 7df926a0f5

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

Change-Id: I348552140ac41926be9f3389d06f7285e30b2e1e