tree db6177dbfbae59f77820ac5ef27a6e70cc703313
parent 199c5af78bfa483ae6c528dea176b6da751d3fed
parent fe892a734761b007b747dc57c8d99f3accf0e206
author Yuexi Ma <yuexima@google.com> 1522824022 -0700
committer android-build-merger <android-build-merger@google.com> 1522824022 -0700

combine NBU modules, add WifiDirect and LocalHotspot modules am: cba91305e8 am: 68e2583096
am: fe892a7347

Change-Id: Icc10cd774645a85bf822af3312fa7f4bda4f43dc