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

Change-Id: I3ae46fa3bdcae1cb026641dd96707d4c73c12a41