Merge "liblog: CTS test" am: f1f7333e7c am: 815e0bd6fa
am: 6e69c8fea6

Change-Id: Ia83079e8296c3b4bcff6f93ed8a14618fa296dd2