Merge "Different bootclasspath for droiddoc."