Merge "Distinguish between soft/weak/phantom/etc references in ahat."
am: 0028ce042e

Change-Id: Idb4e2b18bdda104aa951e322b430ddc9ac10249a