am 2ae5805c: am 164a9842: Merge "stagefright aacenc: Properly terminate a comment"

* commit '2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
  stagefright aacenc: Properly terminate a comment