Merge "Enable 64-bit linking on arm" am: b651c29d26

Change-Id: I6799b6d1abe3aa92358ddd19c03bf969ff85938a