Merge "Increase the Java heap size for droiddoc"