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

Change-Id: I26bc405a95db2953fddf6098fd59df731191a3d0