Merge "Remove reference to libc_logging." am: 87428f1e82 am: 46b2135bfb
am: ed566c401f

Change-Id: Ia3390de121f6146e81c5bd61d9b8327e7d810a7c