am 9b2d35f0: DO NOT MERGE Classpath cleanup in libcore

Merge commit '9b2d35f0a81cb0483337ab0a776c5e9287e84dbf' into gingerbread-plus-aosp

* commit '9b2d35f0a81cb0483337ab0a776c5e9287e84dbf':
  DO NOT MERGE Classpath cleanup in libcore