Merge "Fix build: update test to use dex::TypeIndex."