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