am 1b08226a: Merge "Different bootclasspath for droiddoc."

* commit '1b08226afa693646facbd718be2b4a657c837dc2':
  Different bootclasspath for droiddoc.