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

Change-Id: I487b90396708d77427326cebeebe203d8bb7cb31