Merge "Switch RmTypeDefs over to asm v5"
am: 611120adfd

* commit '611120adfd390a98a1ffab89a6b20d1be589edf6':
  Switch RmTypeDefs over to asm v5