Merge "Fix opcode tests for sput_object" into froyo