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

Change-Id: I5fcd6c0ef2e7c3e8f1b3f1baac218eaf3821054c