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

Change-Id: I614e0c371e89de3ab3be1f36cae3e180e28bc992