Merge "Make android_logger_set_prune_list() sane"