Merge "Refactor ClassAccessor to use an index instead of ClassDef pointer"