Merge "liblog: use private/android_logger.h"