Merge "liblog: convert to C++" am: c5ce8a8ef7
am: 25b3cf46f9

Change-Id: I99c85f92a79459661d22b26128fdd14e43ac0e4c