DISGUSTING HACK to keep mediaserver from aborting when a picture is taken on S4

Change-Id: I99e08ad8d2562bd56f40daef88f82145126da4f7
Merge remote-tracking branch 'cm/cm-10.2' into disgusting