Merge "Temporarily disable elftree on darwin-x86"