am 698bc40c: am 48138683: am e22e8b80: am 2bf7a779: Merge "Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)" into jb-dev

* commit '698bc40cd8fc55d48f2adc90a2856200891b6ef2':
  Adds a CTS test verifying audio encoder functionality. (AAC, AMR-NB, AMR-WB)