Merge "Fix dex cache resolved types and class table mismatch." am: 8d4b118963
am: c092e44c28

Change-Id: I8cae4230b33548d20327dc0cd933ec964e2c0fed