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

Change-Id: I6931a899078460e8879b6c0f5b3dcb1f8d55b884