Makes some change to Collector for further refactoring - Finally gets rid of explicit inferFrom API in Collectors - Introduces CollectorModern as a base for CollectorMoz and CollectorChrome - CollectorChrome no longer extends CollectorMoz Change-Id: I496c2358180662e54ff50cd2a5c08b29f505e314