Merge "C2SoftVpxEnc: Move IntfImpl definition to C2SoftVpxEnc.cpp" am: f70982c797 am: 97d08be826

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

Change-Id: I77e8729014f0d7ad4373034e5f7f98fa41537059