am ad1267eb: (-s ours) Merge "DO NOT MERGE - x86_64: Update makefile to avoid early fail of any other project build"

* commit 'ad1267eb72a55ceae0a7e758a251470ed3c64dde':
  DO NOT MERGE - x86_64: Update makefile to avoid early fail of any other project build