Merge "liblog: logprint followup" am: 60c77ed265
am: 7cb2658b26

Change-Id: I4f8409ad193976b2d8089cbf7982fb2255c29cdd