Cherry-picked from cd285951 for arm64 only, with a small addition.

Change-Id: I864f811e7fe5cb47390e6a0588b48d057ccb6292
Reviewed-on: https://chromium-review.googlesource.com/1240334Reviewed-by: Sigurd Schneider <sigurds@chromium.org>
Commit-Queue: Georgia Kouveli <georgia.kouveli@arm.com>
Cr-Commit-Position: refs/heads/master@{#56194}