Merge "Add support for multiple html directories to droiddoc." into gingerbread