Fix classpath in jars

Change-Id: Iad7f0990573aa3fdaa1fcc84723f600e756e9e20