Merge "media: Add a workaround to tolerate the CSD buffer sent to VP8 decoder." into nyc-dev am: 71a2b51601
am: f425f7b839

* commit 'f425f7b8396dc860edd4c3590ab54e7e60ad5c68':

Change-Id: I4ff9d3a5d9d3f89a80eea55748a513b18c8046a1