Merge change 1548 into donut

* changes:
  NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).