Merge "Refactor ClassAccessor to use an index instead of ClassDef pointer"
am: 20c64f8d80

Change-Id: Ia2277a647647e26f14d4584145bf2cc3c68550ee