am d3d90fb6: am 87d906b2: am 5f37cda9: Merge "ndk: <unistd.h>: minor cleanup"

* commit 'd3d90fb611bc49577eefa59b4f6f10fed3c74c42':
  ndk: <unistd.h>: minor cleanup