Merge "Fix private/bionic_name_mem.h build breakage."