Merge "logd: liblog: 64-bit issues"