am 18afcee7: am 67400d49: Merge "Added tests for audio effects in MediaFrameworkTest" into gingerbread

Merge commit '18afcee767694fd1dce1a371769dc898102143ff'

* commit '18afcee767694fd1dce1a371769dc898102143ff':
  Added tests for audio effects in MediaFrameworkTest