am e2481f90: (-s ours) Merge "Fix public API of ClassReferenceListBuilder"

* commit 'e2481f9003590301e72f1e318e34820cdae3b923':
  Fix public API of ClassReferenceListBuilder