Hopefully fix media scanner issues

Please see http://forum.xda-developers.com/showpost.php?p=44370296&postcount=357
For inspiration

Change-Id: I71573992c565e9f32b2256f8ef017cc8ac49b285