Merge "Remove DexFile direct accesses to CodeItem"