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