Fix make files for unbundled tree builds

Change-Id: I6522ad5422c69852d540119b9cbda281d87fde55
2 files changed