Merge "Switch RmTypeDefs over to asm v5"