Added support for arm64, by modifying the
patch that reverts an earlier commit.

Change-Id: If0d1920c1a91b3ad44c4ae9c299270b7806db811