am 6d2def71: am c28fde57: am 0b515aec: am 3cfca67b: Merge "Fix possible integer overflow in MtpStorage"

# By Henrik Engström
# Via Android Git Automerger (3) and others
* commit '6d2def71e0a7f6ed81b96444fb1cce7177251b36':
  Fix possible integer overflow in MtpStorage