Merge "AArch64: oat patches should be 32-bit ints."