remove classpath

Change-Id: I517ccaddd76450e3d68f1979ddf95452ed260da1
Merge remote-tracking branch 'cm/cm-12.0' into HEAD