[automerger skipped] goldfish-codecs: use 2560x2560 as largest resolution for vpx am: 4cbda82fda am: b5a218eb7f -s ours am: b80de8b497 -s ours

am skip reason: Change-Id Ia17938c1826a5b7bdb60bb42cff0a0ae86add318 with SHA-1 694018746c is in history

Change-Id: Ifc3779450cbadcd510ad494f5817689b15a5686f