Merge "logd: allow opting into simple or serialized log buffers" am:...

Merge "logd: allow opting into simple or serialized log buffers" am: ed99870f am: c89430bd am: fbac065c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1362341

Change-Id: I777995329d38b98551ec2bdf05165b6c7ac8d7d2