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