Merge "libstagefright: Remove dependency on libwebm" am: 78e9cf67 am: 3a6272b6

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



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