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

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