Use binder bitness instead of primary arch for references root.
am: 7ee3fb679a  -s ours

Change-Id: I3d4294d943ce5e2df5d1c7593765bf86f3a7128d