Merge "Add 64-bit CFLAGS to set ENGINE directory"