Update to use the correct logging library. am: 961e625526
am: f9874a121e

Change-Id: Id127a485eb1ef3eeb6c531d8cdcfc12847e65e4b