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

Change-Id: I4781116fca2cbdf20cb5ec80b74fc20145ade022