Merge "x86_common.mk has been replaced by HOST_x86_common.mk"