Merge "media: fix MediaCodecTest#testException" into rvc-dev am: c5162ed949

Change-Id: I123ffdbc7f5448f12ef101dc30d43214a96241d0