ADT 22 classpath changes
Merge remote-tracking branch 'refs/remotes/origin/eclipse' into eclipse