Merge "Fix wifi test" into pi-car-dev
am: 32d224772a

Change-Id: I4ee80320f72b8c4a85d1c7191d8963e54d2d3ccc
tree: 594a9db6c25a0c08af1cb91d4d17e9f597dfb860
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. PREUPLOAD.cfg