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

Change-Id: Ic41a69bf06b3f7f2ee939bf0775ee88092921ddf