Merge "CTS DecodeAccuracyTest replace 520x360 60fps test videos with 30fps." into oreo-cts-dev