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

* commit '5070204e117d5a20f06fa337c652e36884f29d86':
  Remove LOCAL_MODULE from generated DBus header path.