Merge "add CUR_DIR as a property for tradefed to find its own path"