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

Change-Id: Id5fb16ce509e2ab89238c25d15fd9d9810bcad80