Merge "Fix DexFile.entries to return class names, not class descriptors"