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

* commit '164a984224f5d430757628028f2522329987350f':
  stagefright aacenc: Properly terminate a comment
tree: be8c3dc3c8d2a781020eba7fb165c440f81ff38c
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/