Merge "Update gsi_arm64 to use gsi_product.mk & gsi_system_ext.mk" am: 3e96647d29 am: 00dc5a2ffd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia854a50c9c31e2459e4871f0719345da44cc5888