Merge "Fix dex cache resolved types and class table mismatch."