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

* commit '6b92aee0021e677a861e1a420250516c42697518':
  Remove linux-unistd.h