bluez mod: address -> addr, to avoid shadowing same-named func
Merge pull request #5072 from hulu/address-shadowing

bluez mod: address -> addr, to avoid shadowing same-named func