Get tests to build in unbundled tree.

Change-Id: I8ce1eedbd2c738eee6a0d2fcb9c5d022c952539d
4 files changed