fix adb.device_serial issue
fix test issue
Merge branch 'develop'