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

Change-Id: Ia57de4d0172426c590f562d57fbba5fff7ec55bf