Update to use the correct logging library. am: 6b6003620b
am: 6a06af42fa

Change-Id: I23433e6ab9ba6fa6c84d5ec99d365e66a56b65eb