Merge "logd: don't use libcutils properties"