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

Change-Id: I70ac10adc9af410c9c3d73488dd92831c7aac373