Update to use the correct logging library. am: 961e625526 am: f9874a121e am: 1b44b2b048
am: 26092ef39f

Change-Id: I482f3cff94281a45234758fd0fb627ac0f6ebb28