Merge "CHA: Don't return a non resolved class to the inliner." am: 25e668b6c7 am: f7f09320e7
am: 5e2bb2cf83

Change-Id: I08111b4f83887aaadeb5c1e70655317f5004015e