am 6481e362: am 8006569b: Merge "Make Java compiler classpath extendable"

* commit '6481e362b4c61b236194d10ae0e70e50d8b2c2a8':
  Make Java compiler classpath extendable