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

Change-Id: Ia388cecfc4f308ba3b78ec4777aed4290a3e8969