Merge "Enable 64bit codegen on ARM" am: 2eb9175e4d am: fd12fddfa0 am: 7fa7d04d30

Change-Id: I14d17a08cbfdbfebb04f3d196e888a794b4cd919