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

diff --cc compiler/oat_writer.cc
Simple merge

diff --cc oatdump/oatdump.cc
Simple merge

diff --cc runtime/class_linker.cc
Simple merge

diff --cc runtime/class_table.cc
Simple merge

diff --cc runtime/openjdkjvmti/ti_redefine.cc
Simple merge