Also include a small fix for getting the encoder queue. Bug: webrtc:7760 Change-Id: I96dc8ffb363b90382276d88148f81d5f89dca5f2 Reviewed-on: https://webrtc-review.googlesource.com/2683 Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20022}