Follow-on fixes from base/logging.h move to android-base

Bug: http://b/26023797
Change-Id: If3eca033ba4d29e9df0f1d8ba8c1f4605b260ef2
4 files changed