Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/FMRadio into cm-13.0

Android 6.0.1 release 22
tree: 2dbbfafb9d969000e54a89ed300522f38772ac83
  1. jni/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml