CMFileManager: Allow for sorting by mime type in search.

Change-Id: Ib633f84532507f2a32d78978a3c0c87d62617fd8
Merge branch 'remote' into mkl