Merge "Fix undefined reference to dl_iterate_phdr for x86"