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

Change-Id: I78fe8dd36d7ba7143604c9aaa46110be9eb9c1f1