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

Change-Id: I1e33427d08b02c4128341ac98c3ce584db694b4f