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

Change-Id: Id782bccc1a60b8866384596c7998b12ef8321b23