FP2-1995: MusicFX: Integrate latest AOSP fixes and improvements

Merge branch 'marshmallow-mr2-release' into HEAD

Change-Id: Ib1d54fad1a5284c9b455201988c705efd15a1194
88 files changed
tree: ccec59dbd2af8aee25080155b36d8f734f34c656
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml