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

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