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

Change-Id: I59edf5501a076577045c983477b7b18f53372a3a