am 16db83c2: am eb07c531: Merge "stagefright amrwbenc: Remove a duplicate, unused file"

* commit '16db83c26442f5e25b6aad77a37b612fa0be9862':
  stagefright amrwbenc: Remove a duplicate, unused file