Merge "LogAudit.cpp: replace newlines with spaces in audit messages" am: 5badada997
am: 5083c589fa

Change-Id: Ic41ed573f2ee717edb347ef1db28daa6ab20de07