am e96d44a0: am 83e63821: am bc8c31e4: am 335482c4: Fix make files for unbundled tree builds

* commit 'e96d44a081d0394a45a4f7a9b1d2e56934df795b':
  Fix make files for unbundled tree builds