Merge "liblog: use EXPECTED_STREQ for strings" am: c37e3f01ee
am: adc054f60d

Change-Id: I10d62d8371761623624a97d4b62f516bb0eb1b8c