am 52cf96e9: Merge "Update eclipse classpath due to change in directory structure" into klp-modular-dev

* commit '52cf96e9aa650ff50a0a25924e81bec35be56c4f':
  Update eclipse classpath due to change in directory structure