DO NOT MERGE: arm64: Fixing the make files for GSI am: 3d7a463d4c

Original change: https://android-review.googlesource.com/c/device/generic/car/+/1527005

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id6aea6635d89b8a3e77b0f9debaf2065a2a2705d