Merge "fix failure in MediaCodecTest#testException" into lmp-dev