Merge "Update to use the correct logging library."
am: 48f6298fa3

Change-Id: I983476d9d35eb6d795cb804142532b25f3a8d9dd