am f6b37817: Merge "Revert "[FM] Move FM Radio JNI"" into lmp-mr1-dev

* commit 'f6b3781771ae674c755661ddbf77b0ce3ee99f1f':
  Revert "[FM] Move FM Radio JNI"
tree: f563f804652839bc48393acc7ca5f448249a8cc4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml