Merge "Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64"