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

Change-Id: I9e628c4fcbf2a2bef82d66a3af510524e72ce95e