Cleanups in logging.h Thanks to Scott Ettinger for the patch this is based off of, which restores the NDK build. Change-Id: I8036dc1388438a4940e6f4ae297162902afd8d3a