Merge "Fix Class.getDex."
2 files changed