Merge "Add new jar that will replace tradefed.jar"