Merge "ACodec: Reduce the TWOmxNode wrapper in GraphicBufferSource" am: 712366758b am: 3be8d0d86e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I036db3d1a5fb786e872399172022e38e5e343da2