Cleanups for eclipse classpath DO NOT MERGE

Change-Id: Ic4ab8299eb2e17f01346887d22620c0f23399328
1 file changed