Merge "logd: liblog: logcat: switch to android_log_clockid() (2)"