Merge "MtpDatabase: Use actual file size instead of media database size column" into jb-mr1-dev