am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files"

* commit '523c09d56c78933eea7fb4f028e0bfa595ca82b1':
  stagefright amrnb: Remove unused leftover source files