Merge "Merge "Add a droiddoc generator for hwbinder.stubs" am: 1142ffcc9b am: c97d768b6b" into pi-dev-plus-aosp
am: 7abed4e137

Change-Id: I2bc81d21482edf6d55662496cb2b926825a0e3f5