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

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

Change-Id: I3bb9c22a87b5c4866a981611d3f1669dca6be04a