Merge "Turn on DepAnn for test-base and test-runner"
am: 8dbbc3543e

Change-Id: Ia6fe0967f92b382042326c288d175c4f60b63190