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

* commit '8da106ebf31d725c00c1910a51f6e1cfb0d8c052':
  Don't confuse stat and stat64.