am 4d2b79f9: Merge "Generate DBus proxies and adaptors separately"

* commit '4d2b79f99ef34a504fe9f7e362a861d7ddee5659':
  Generate DBus proxies and adaptors separately