Merge "Use binder bitness instead of primary arch for references root."
am: 165477b817

Change-Id: I974eaa0b43ae86d2f37c23d2371afbbb918c2de3