Merge "AArch64: Use long for pointers in MTP classes"