Merge "media: fix MediaCodecCapabilitiesTest.testAvcBaseline1 test case" into lmp-dev