Merge changes I6d0c72f0,I96a90ff5

* changes:
  Allow for None response from wlanGetCountry
  Add timeout to iperf client starts
tree: 81e7b3aa3f9a6605ece32393a23e6c13c8ed5d29
  1. acts/
  2. acts_tests/
  3. tools/
  4. wts-acts/
  5. Android.mk
  6. OWNERS
  7. PREUPLOAD.cfg