Merge "Keep dex files live in class table"