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

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