Update testing build configuration to be compatible with new changes

Test: Make sure tests can build and run
Change-Id: I26a988e646c4cd9bbbca145452f3ca2e098c84d5
3 files changed