Merge "Decoder: Fix in MB count in MBAff error handling" into mnc-dev am: d1ebbd7139 am: 2d98342fe7 am: 87b1aa95e4 am: 24f6497bf3
am: 84f6d11a4a

Change-Id: Ice1ea32838aa7e112b743518e260499ed064264f