Merge "liblog: tests: crashes in logcat.descriptive" am: f218210f6e
am: 236daaf478

Change-Id: I3f6154e833e5da809a36ee478a4500effa8ff3ef