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

* commit 'ef963b809d37612faba62ee3176986c8700fc3f4':
  Fix opcode tests for sput_object