Merge "Enable 64bit codegen on ARM"