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

Change-Id: I654945cc7d760d769e7edd024e78a5a883d9602f