Merge "DO NOT MERGE: - VideoEncoderDecoderTest#testAvc1920x1072" into kitkat-dev