Merge "Added CMakeLists.txt for x86/x64 build"