am afd4df20: am 6fa47ca4: Merge "Fix ndk_cruft.cpp __getdents64 build failure."

* commit 'afd4df20c99e52be84d1cac2108c18619f32b5f2':
  Fix ndk_cruft.cpp __getdents64 build failure.