Merge "rename avahi-common/malloc.[ch] to avahi-malloc."