Merge "Use blocklist sub-property in sanitize" am: 0d0c74a487 am: 667129de58 am: 369bcd4b99 am: c6b67bce25 am: 8906ee6548

Original change: https://android-review.googlesource.com/c/platform/external/libvpx/+/1374719

Change-Id: Iab224782f7a3406e06a965f00642b97d2b869b67