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

Change-Id: I481d9bac8aed628d70d290e59af67f8f144ae42a