Merge "AArch64: Correction of struct surface_t"