am 1bfad87c: am 02d3c328: am 523c09d5: am 64b3fe55: Merge "stagefright amrnb: Remove unused leftover source files"

* commit '1bfad87cacb38a2e1418de8019ccb775f8926f66':
  stagefright amrnb: Remove unused leftover source files