am aa80f1a3: am c9a60b0f: Merge "Don\'t confuse stat and stat64."

* commit 'aa80f1a3caf6271f1c48a779e260811f2802a9f0':
  Don't confuse stat and stat64.