Merge "Remove android.test dependencies on a.o.PerformanceCollector"