Merge "Add missing extensions, fix scan of bad media files." into pi-dev am: 58a1c16fa8
am: 93d1408000

Change-Id: Ia0e2a71ff101700c1eab629eef281981c4dd01bb