+ use helper scripts from the same dir, not from $PATH Change-Id: I7aba773c8dbff5f8643a39fa1ed8d26867f3a86d