Merge "cts-tradefed: Don't add . (working directory) to classpath."
am: aa7ade931d

Change-Id: If78e3f5d8a290afd4e358994544bc504fd5b700a