Merge "liblog: __android_log_pmsg_file_write() cleanup"