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

Change-Id: I5c97e47ff9a5f193645660c195ddd707b86ad025