Merge "Experimentally reenable mpeg4 and h.263 hardware decoders."