resolved conflicts for merge of 4197cfdb to mnc-dev-plus-aosp

Change-Id: I01e295c4f86e821f84e45fbf1985088dd1a5347a

diff --cc osi/src/config.c
index c6b73dc,11a5baf..46acab0
--- 1/osi/src/config.c
--- 2/osi/src/config.c
+++ b/osi/src/config.c
@@@ -24,7 -24,7 +24,8 @@@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
 +#include <unistd.h>
+ #include <sys/stat.h>
  
  #include "osi/include/allocator.h"
  #include "osi/include/config.h"