Merge "Remove AmrInputStream"
am: 70b262b0f2

Change-Id: I46f8cf7847982e8ab590c9016472fea93aa4a27b