Merge "Merge "DO NOT MERGE Codecs: Fix EOS handling in soft codecs" into nyc-dev am: 47f19e28a1 am: 5ea7d62f96" into nyc-mr1-dev-plus-aosp
am: 6691f9ace0  -s ours

* commit '6691f9ace0f0bb11640b61de6703c4fa5eb275be':

Change-Id: Icc6b35aaf8e53c1ebc874e0f17e89ee44a8ed1b1