am a0c9af66: am 02bee7be: Merge "Select common codecs for MediaCodecTest.testException" into lmp-sprout-dev automerge: 18640ba

* commit 'a0c9af66b3bc5bdaff607409d3ec329bddb59b83':