Merge "Change unistd.h to stddef.h to be correct" into gingerbread

#include <utils/FileMap.h>

#include <utils/StreamingZipInflater.h>

#include <string.h>

#include <unistd.h>

#include <stddef.h>

#include <assert.h>

static inline size_t min(size_t a, size_t b) { return (a < b) ? a : b; }