Merge "Enable 64-bit linking on arm"