Merge "Fix html_dir_files in droiddoc.mk"