[automerger skipped] Merge "C2SoftVpxEnc: Add support for encoding from a...

[automerger skipped] Merge "C2SoftVpxEnc: Add support for encoding from a larger graphic block" am: edc42f0c am: 11689baa -s ours am: b87a91b9 -s ours am: 88dd79f7 -s ours

am skip reason: Change-Id I9eed491d3211b42cc4b9f7e42fb386240c745b15 with SHA-1 66e98bd1 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1325723

Change-Id: Ie65e5cb4c9a930edabf9c001473cefffe9dc71b6