FM: Break bootclasspath dependency

Use the library directly instead of forcing its global inclusion

Change-Id: I547c85b1b6c4ce09333e2eac2059cca1b851a346
diff --git a/fmapp2/Android.bp b/fmapp2/Android.bp
index eeeab5f..518e3e6 100755
--- a/fmapp2/Android.bp
+++ b/fmapp2/Android.bp
@@ -10,4 +10,5 @@
     platform_apis: true,
     aaptflags: ["--legacy"],
     system_ext_specific: true,
+    required: ["qcom.fmradio.xml"],
 }
diff --git a/fmapp2/AndroidManifest.xml b/fmapp2/AndroidManifest.xml
index fc55149..a8af822 100644
--- a/fmapp2/AndroidManifest.xml
+++ b/fmapp2/AndroidManifest.xml
@@ -61,6 +61,10 @@
         android:allowTaskReparenting="true"
         android:taskAffinity="com.caf.task.fmradio"
         android:name=".FMAdapterApp">
+
+        <uses-library android:name="qcom.fmradio"
+            android:required="true" />
+
         <activity android:icon="@drawable/ic_launcher_fmradio"
             android:name=".FMRadio"
             android:label="@string/app_name"