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

Change-Id: Ia69c99217c2be1d536ab407ed71c2162582fbdb6