Merge "AArch64: Use of long for pointers in PropertyValuesHolder"