Merge "Change include directory"

diff --cc Android.mk
Simple merge

diff --cc server.cpp
index 4f6a4ee,96257c8..d281613
--- 1/server.cpp
--- 2/server.cpp
+++ b/server.cpp
@@@ -14,10 -14,8 +14,10 @@@
   * limitations under the License.
   */
  
- #include "server.h"
+ #include "wificond/server.h"
  
 +#include <android-base/logging.h>
 +
  using android::binder::Status;
  using android::sp;
  using android::IBinder;