Merge "Enable 64-bit linking on arm" am: b651c29d26 am: 4a0a4760bb am: 3adc56133b

Change-Id: Iccfd0a635cf7e2c59c0e971f3dd6e4399dd51e52