Experimental change to make common mapping for win32 and x64

--HG--
branch : experiment_with_x64_common_mapping