Merge "Revert "Remove AmrInputStream""