Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition"