Partially revert r84730 by removing N2VDup from ARMInstrFormats.td and modifying