Merge "Update to use the correct library for logging." am: f5e1ac67ed am: 34d006ee9c am: fb89d1237d
am: 6cb0ee580a

Change-Id: I27419afa6ff8ebda825e474d9cee242a29a31f53