Merge "Remove CHA dependencies for class unloading when JIT is disabled"
am: 5864ab200f

Change-Id: I63db96efd718601bbb0071ec27156d2c63bccf64