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

* commit 'b55bb77ef260f97337be7f15dc9c1433f2ddce98':
  Different bootclasspath for droiddoc.