Merge "Update to use the correct library for logging."
am: f5e1ac67ed

Change-Id: Idbd600f20212143ddced9c7723cb28b414afa349