commit 00a436cd23f185c4d2249018e4f9255eee241375
author Julian Odell <juliano@google.com> Wed Sep 28 13:55:45 2016 -0700
committer gitbuildkicker <android-build@google.com> Tue Oct 04 16:47:43 2016 -0700
tree c899f49db2340c03ca66fadd7baba347107946a5
parent 42bd543aaba948ef0e44513b81d280bee14c3eef

Fix collisions due to ignoring outer class names.

Second attempt - this time strip the type parameters from
the class name but keep the qualified token name (which
will include both Outer and Inner class names so
OuterClass1.InnerClass<V> will become OuterClass1.InnerClass
rather than just InnerClass).

See b/31775016.

Change-Id: Ib2465cc33006e086ab66a6e8e307e98ff1dc37e5
(cherry picked from commit cbc19f92af1b7cef2c2b2d1d3c2cdd12ce27b290)
(cherry picked from commit 35e0d1defab101925cdbe1490050989f2b813ac1)