Merge "Fix droiddoc generation."