Merge "Remove include/private/android_logger.h"