Merge "Use binder bitness instead of primary arch for references root."