Fixed the classpath for the project to be more generic

Change-Id: Ib045cc7d5c048f81c9be4480d718cb0b93e17e6d
Merge "Fixed the classpath for the project to be more generic"