am d8960b08: Merge "Remove code related to extended-opcode."

* commit 'd8960b08af1b0e3b4248417933844f503933af6a':
  Remove code related to extended-opcode.