Merge "liblog: Fix memory leaks" am: 91c47309a0
am: 20b6048e1b

Change-Id: I162bd38eff27c1231d4da9db34b7e032d2811e4f