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

Change-Id: Ibd77175c39dcf2df96bd9be1809023f9a3e42279