change to use latest uiauto and instrument