DO NOT MERGE - Merge ab/7272582 am: d23e41f829 am: 9d4b1ad1d6

Original change: https://android-review.googlesource.com/c/platform/external/libaom/+/1735798

Change-Id: Ic0e2f82049f44767be25e5adba11e26710b55688