Rewrite classTrack to not use jweaks. am: c53a7db69e
am: defe3c1ccf

Change-Id: I7981c10f1275db189e5945ca5d432fb28d097f1a