am 376154d4: Merge "Fix Eclipse classpath file for ICS."

* commit '376154d427968e3a43088860fab81d9de5bf7270':
  Fix Eclipse classpath file for ICS.