am 97e4d754: am c32a4361: (-s ours) am f4603673: am 04b94b25: Merge "Use 64-bit file sizes in fastboot."

* commit '97e4d7540778605042982a5d64840f851772d6da':