This propagated into various other places. Also had to #include headers that were implicitly pulled by "scoped_ptr.h". BUG=webrtc:5520 Review URL: https://codereview.webrtc.org/1920043002 Cr-Commit-Position: refs/heads/master@{#12501}
Also fixes a crash on encoder Release. BUG=webrtc:4081 Review URL: https://codereview.webrtc.org/1660963002 Cr-Commit-Position: refs/heads/master@{#11729}