Merge "Rename lib64 to lib in arch-arm64 and arch-arm64"