Merge "Add DexIndexOverflowException"