am 2b2c9dff: am 4e719eaf: Merge "Change .dbus.xml extension to .dbus-xml"

* commit '2b2c9dff35304c21ebe1e793a16443a882920f75':
  Change .dbus.xml extension to .dbus-xml