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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I132330985aa1c68bc0d64d281d9c76d1d1312dea