[automerger skipped] Merge "Remove android-support-test lib from testutils."...
[automerger skipped] Merge "Remove android-support-test lib from testutils." am: bc18cc9b am: 2a8c9499
am: a22fbb80 -s ours
am skip reason: change_id Ia825e0926b46855f9056739441cb21a065692076 with SHA1 ec6bcbce is in history
Change-Id: Id014babcc284424a40909a0259400fb5c69f8b43