Merge "Remove old h264 decoder" am: 52b4df3292
am: dc0f545763

Change-Id: I4f3f2e54f2abcb38806adb0b2930dce8154fa90e