am 2171d57c: Merge change I6f2fcdd7 into eclair-mr2

Merge commit '2171d57cfcc25e7db63b4ae0a852504bdd3c507e' into eclair-mr2-plus-aosp

* commit '2171d57cfcc25e7db63b4ae0a852504bdd3c507e':
  Fix eclipse default .classpath