Merge "Use binder bitness instead of primary arch for references root." am: 165477b8 am: 62832238 am: 8ef9cfcf Change-Id: I481d9bac8aed628d70d290e59af67f8f144ae42a