am ecb59176: Merge "Classpath cleanup"

* commit 'ecb591762646cee7bf8c88631ec2b2ec1fb8d5f3':
  Classpath cleanup