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

Change-Id: Icafcabcc2b99dac4d897e0d68725c53e84fdd5c5