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

* commit '8815d261d9fefbac8f24936dc37a055ab9ced038':
  Don't confuse stat and stat64.