Merge "Adjust log buffer format to match logcat"