Merge "DO NOT MERGE - x86_64: Update makefile to avoid early fail of any other project build"