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

* commit '748486657623fc0753d11bc2d91c113bca584a1e':
  fix failure in MediaCodecTest#testException