Merge "Turn on DepAnn for test-base and test-runner" am: 8dbbc3543e am: 38a916fb74
am: 01bdda9de8

Change-Id: I6805f692437719838bef7a4b7e51b3130d6f384e