am 7b49da7e: Merge "Remove LOCAL_MODULE from generated DBus header path."

* commit '7b49da7e9a97f7064e275251957ed78dc5e38360':
  Remove LOCAL_MODULE from generated DBus header path.