Merge "Bugfix for transition from droiddoc to doclava"