Merge "Count unique string, method names, and type names"
am: 838387a266

Change-Id: Ib71ef0313b41fb647360404eee9780b399897b78