Merge "Remove LOCAL_MODULE from generated DBus header path."