Merge "Bring in aarch64 support in apex"