fix merge error
fix merge error

emmahuang/uiautomator,mcdaniel67/uiautomator,hgl888/uiautomator,jyx140521/uiautomator,xiaocong/uiautomator,samdfonseca/uiautomator,TheLady/uiautomator,wirelesscollege/uiautomatorpython,xsqorange/uiautomator,VikingDen/uiautomator,openatx/atx-uiautomator,ssmail/uiautomator,0xr0ot/uiautomator