am f607faf9: Merge "Work around a couple of doclet API bugs."

* commit 'f607faf92243699f3251980e7bc9f95e9cd09c06':
  Work around a couple of doclet API bugs.