am 287bf9ab: am ef963b80: Merge "Fix opcode tests for sput_object" into froyo

* commit '287bf9abb937b1306a63dc18d85dd5019da8860e':
  Fix opcode tests for sput_object