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

Change-Id: I845999386e77fef8672371260d2b98184f455e3f