Merge changes I55bfcddf,Ida0c2251 into private_master

* changes:
  FM: Disable QCT FM app
  FM: Build libfmjni by default
tree: f57194c6967e03d765873021a3e42c38bec9879b
  1. fmapp/
  2. fmapp2/
  3. FMRecord/
  4. jni/
  5. libfm_jni/
  6. qcom/
  7. Android.mk