Merge "Remove old h264 decoder" am: 52b4df3292 am: dc0f545763
am: d4fec5bea9  -s ours

Change-Id: I2cb240110acfd177c66ec9d3c3bcfd5af2868e65