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

Change-Id: I056e6f230f68a58d40793ac14c5574db0641d9c3