am bc95f91d: am e33ad352: Merge "Remove linux-unistd.h"

* commit 'bc95f91d24b6238f3a56363468bfb3129eb7429b':
  Remove linux-unistd.h