Merge "Make sure the referring class is in the dex cache."