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

Change-Id: Icffcb8367e69bfa2db75c908ea0ec56309322882