Merge "Merge "Add a droiddoc generator for hwbinder.stubs" am: 1142ffcc am: c97d768b" into pi-dev-plus-aosp