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

Change-Id: I7fce58c93f84ae007783f0d0ae89981eee6574a7