merged common_x86.h and common_x86_64.h from develop