am f0d2a546: Merge 78e7f1f0

* commit 'f0d2a54669c8bf14e95482437e361c81dfb62404':
  Increase the Java heap size for droiddoc