bug 991020 - fix adb errors. r=armenzg
no bug - fix pyflakes warnings. r=me