Merge "Added CMakeLists.txt for x86/x64 build"
am: 2f018c0603

Change-Id: I37416cdb199055382460e5a9e7595f397e544d1c