Merge "Enable cfi for libvpx" am: 9c8333802e am: 4dc91cbd9b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6849b8bccc97fcfbd1b1af0930a3b5b332b3f246