Merge "ndk: <unistd.h>: minor cleanup"