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

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