I updated Eclipse with the new SDK tools (rev. 23), but now when Eclipse starts I receive the error:
This Android SDK requires Android Developer Toolk
I found a solution for the problem with "conflicting dependency". I don't have the same page of Daniel Díaz's response, but a page show "conflicting dependency", and I can't make anything.
The problem is that I'm not the owner of the file. Eclipse was installed in other session (on OS X). I have the right to read and write the Eclipse file, but I'm not the owner. Make a "chown" command on all Eclipse files to solve the problem. After, I have the same result as Daniel Diaz.
I hope this helps someone.