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

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