Merge "Revert "Remove AmrInputStream"" am: e2d8581529 am: 01cb199bed
am: 8b1eed4ee8

Change-Id: Iab40a083d9d0d2c9d4359be25e88d25f8fdc12aa