Merge "Fix runtest.sh in frameworks/base/wifi"