Merge "Remove reference to libc_logging."
am: 87428f1e82

Change-Id: I7c6cb9373e78bc4dfddc8f8685e9293371772975