Uplift libvpx/libaom patch for cpu-features.c
cpu-features.c
from the Android NDK is included twice when webrtc is disabled.
https://searchfox.org/mozilla-central/source/media/libaom/moz.build#92 https://searchfox.org/mozilla-central/source/media/libvpx/moz.build#102
This results in a build failure due to multiple definitions
.
36:05.43 /home/android/.mozbuild/android-ndk-r15c/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error: /home/andr
oid/tor-browser/obj-arm-linux-androideabi/toolkit/library/../../media/libaom/cpu-features.o: multiple definition of 'android_getCpuCount'
36:05.43 /home/android/.mozbuild/android-ndk-r15c/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /home/android/tor
-browser/obj-arm-linux-androideabi/toolkit/library/../../media/libvpx/cpu-features.o: previous definition here
36:05.43 /home/android/.mozbuild/android-ndk-r15c/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error: /home/and$
oid/tor-browser/obj-arm-linux-androideabi/toolkit/library/../../media/libaom/cpu-features.o: multiple definition of 'android_getCpuFamily'
36:05.43 /home/android/.mozbuild/android-ndk-r15c/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /home/android/tor
-browser/obj-arm-linux-androideabi/toolkit/library/../../media/libvpx/cpu-features.o: previous definition here
36:05.43 /home/android/.mozbuild/android-ndk-r15c/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: error: /home/andr
oid/tor-browser/obj-arm-linux-androideabi/toolkit/library/../../media/libaom/cpu-features.o: multiple definition of 'android_getCpuFeatures'
36:05.44 /home/android/.mozbuild/android-ndk-r15c/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x/../../../../arm-linux-androideabi/bin/ld: /home/android/tor
-browser/obj-arm-linux-androideabi/toolkit/library/../../media/libvpx/cpu-features.o: previous definition here