Merge remote-tracking branch 'origin/upstream-master' am: 2efb1cd57a am: 739708406b am: 4534b4c172

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

Change-Id: Ia979de631ba44ceb2731eb967ade740b552fa95e