am 18618e55: (-s ours) am 9b2d35f0: DO NOT MERGE Classpath cleanup in libcore

Merge commit '18618e55055cb2377c88004e18f6e147899bf216'

* commit '18618e55055cb2377c88004e18f6e147899bf216':
  DO NOT MERGE Classpath cleanup in libcore