Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am: 74a2af11b9
am: 0817640c9f

Change-Id: If72152b0e19ab8942d56d99819f5670950770a91