Merge "Add hiddenapi entries from bugbot scrape of bug reports"