Merge "Remove android-support-test lib from testutils."