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

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



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