Merge "Add package html files of droidstubs rules as inputs." am: d3243c5b4e am: 732df78438

Change-Id: I891652827e6336a74433b90448408a3c3a3ad6a1