Merge changes from topic "mv-gsi_arm64-makefile" am: 30c83626e4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec8a138381a7ba4c7d22d841683602e9dd7e59da