Update arm64 compilation

Change-Id: Ifbff513a394e45cd081cd28cda57f95d6b040c24