Bug 946908 - Follow-up: use adb_path; NPOTB