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

Merge "Merge "Notify Errors Appropriately from SoftMPEG2" into mnc-dev am: 74a2af11 am: 0817640c am: 41c60ea3 am: e2424e98  -s ours am: a51cfb3a  -s ours am: d77a443d  -s ours am: 9dd993e5  -s ours am: 3ed228d8  -s ours am: e003b893  -s ours am: 8c8012d1  -s ours am: 7f145e88  -s ours" into oc-dr1-dev-plus-aosp
am: bde8c33a  -s ours

Change-Id: Iec8e5c5bee4d19fde50f506027ea7c096e6df8f8