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

Change-Id: I2872c2aa5257d0828e1d6c6176844b9827a9f3a4