ART: Refactor ClassJoin code
am: 5dfbe7ae9e

Change-Id: I9c497509d9d163b33831ef2f914b285a3ff3c59f