Combine the index and type mapping tables for intra and inter. Change-Id: I4274f0b5afac26f7e395467bdf5cf18077eacbee