Merge "Fix build errors from update of external/webrtc" am: 8059aeb9 am:...

Merge "Fix build errors from update of external/webrtc" am: 8059aeb9 am: f7f0a49d am: 96ccb5cf

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



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