Merge "Remove AmrInputStream"