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

* commit '5daa6a96469217293e08bf5ef996a178d8b44f35':
  Fix opcode tests for sput