resolve merge conflict
Merge pull request #8148 from davidflanagan/bug837236-v1.0.1

Bug 837236 - share video decoding hardware among Camera, Gallery and Video r=daleharvey a=tef+