Merge "Remove android-support-test lib from testutils." am: bc18cc9b19
am: 2a8c949988

Change-Id: I43eac6807d208c35e1338a6cc0bd626da440b6e3