Merge remote-tracking branch 'origin/upstream-master' am: 2efb1cd57a

Original change: https://android-review.googlesource.com/c/platform/external/libwebm/+/1504154

Change-Id: I1edc0db1e552c633cc882dd16570be02ef2b90c3