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

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



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