am 0014f661: Fix make files for unbundled tree builds

* commit '0014f661f355008b0ada8ff9562673b69014d3f6':
  Fix make files for unbundled tree builds