[automerger skipped] combine NBU modules, add WifiDirect and LocalHotspot modules
am: 709e0f208f  -s ours

Change-Id: I33d88987d841a147f6063b6309ac8ecabab5b942
tree: db6177dbfbae59f77820ac5ef27a6e70cc703313
  1. src/
  2. __init__.py
  3. Android.mk
  4. AndroidTest.xml
  5. OWNERS