am 25c0096b: am b55bb77e: am 1b08226a: Merge "Different bootclasspath for droiddoc."

* commit '25c0096bd3ce0f34de5907dc4ef64f48c944c50e':
  Different bootclasspath for droiddoc.