am e9664fea: am 5b6290bc: am ff5b0fc8: Merge "Remove the dependency on the non-uapi __kernel_nlink_t."

* commit 'e9664fea54d21f765c906006db27b8e275c4a198':
  Remove the dependency on the non-uapi __kernel_nlink_t.