Merge "Remove old h264 decoder"
am: 52b4df3292

Change-Id: I85f7d082f6168670108c158ebd00eac6e621ee4a