diff --git a/universal7885-common/vendorsetup.sh b/universal7885-common/vendorsetup.sh
index 76d9ef3..a731d48 100644
--- a/universal7885-common/vendorsetup.sh
+++ b/universal7885-common/vendorsetup.sh
@@ -27,7 +27,6 @@ echo "Generating A30 Makefiles"
 ./device/samsung/a30/setup.sh
 echo "Generating A40 Makefiles"
 ./device/samsung/a40/setup.sh
-ln -sf device/samsung/build.sh
 
 # BT Call patch
 if ! grep -q ESCO_TRANSPORT_UNIT_SIZE system/bt/device/src/esco_parameters.cc; then
@@ -36,3 +35,8 @@ cd system/bt;
 git apply ../../device/samsung/universal7885-common/.patch/BTCalls-On-Samsung.patch;
 cd -
 fi
+# For FM Radio
+if grep -q isAudioServerUid\(callingUid\) frameworks/av/services/audioflinger/AudioFlinger.cpp; then
+echo "Applying FM routing patch"
+sed -i 's/isAudioServerUid(callingUid)/isAudioServerOrSystemServerUid(callingUid)/g' frameworks/av/services/audioflinger/AudioFlinger.cpp
+fi