Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'

Change-Id: I51337014e2851f47dd5e183c4bfdf39bafa59942
tree: e493bc44925cd955c5bd6947666c0004be5507b8
  1. client/
  2. include/
  3. server/
  4. Android.mk