Merge "DO NOT MERGE Codecs: Fix EOS handling in soft codecs" into nyc-dev am: 47f19e28a1
am: c5004b233c

* commit 'c5004b233c1f47593c1ef181c737e38885be9676':
  DO NOT MERGE Codecs: Fix EOS handling in soft codecs

Change-Id: Ibdb1f2207dfa45ffb563d96018b8407e42baeaa8