Merge "video files with mimetype  video/x-ms-asf can't scan to Gallery" into qt-dev am: 6f574c4d3a
am: 1aa2934cf2

Change-Id: I225548e8a017b46d490792813e0f95a3e2dd85c1