Merge "Fix ndk_cruft.cpp __getdents64 build failure."