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

Change-Id: I6508127afc4434f33533c2dd13db17db092e9788