Merge "oprofile/daemon doesn't build for x86_64."