[automerger skipped] Merge "OMXNodeInstance: Validate size of structures" into...

[automerger skipped] Merge "OMXNodeInstance: Validate size of structures" into rvc-dev am: 5dc701f9 am: e6ca6072 am: c53d2498 am: 838ea74d am: 5d527393 am: 2e860a5a am: bf772136 am: c73ad614 am: 64d3fdac -s ours

am skip reason: Merged-In I5130d015cbce1b30d6f4fffeaa4cf3b35c974184 with SHA-1 b5cdaa40 is already in history

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



Change-Id: I1fa2c8452960cd39c317adb034f7b5a9c0433d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>