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

Change-Id: Ie6cc701a3f8e9c6753378651443642c726f53fa9