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