am be835b6f: am 90219d98: am cb733bc5: Merge "Fix droiddoc generation."

* commit 'be835b6f3eae780557369ac9cf2fdfacec6a2874':
  Fix droiddoc generation.