More hackery! This adds some tests and ensures that our own icons are mapped to the existing template icons. Bug: T187916 Change-Id: I49073f22995c6730369235d6039939915ba2079c