Fix make files for unbundled tree builds

Change-Id: I6522ad5422c69852d540119b9cbda281d87fde55
(cherry picked from commit 0014f661f355008b0ada8ff9562673b69014d3f6)
2 files changed