Merge "Add the missing aarch64 user structs."