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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4bccda658689e8d9471e8dc346beabf578ff5deb