Merge "Revert "Enable 64bit build for x64 target""