Merge "liblog: __android_log_pmsg_file_write() cleanup"
am: 6da1ea0e48

Change-Id: I795733c69d5dd4be515358900fee0cdb8d5e44b9