am e6253eca: Merge "Fix opcode tests for sput" into froyo

* commit 'e6253eca5248fa7b19f413b591f95dce59de6500':
  Fix opcode tests for sput