Merge "Revert "Remove AmrInputStream""
am: e2d8581529

Change-Id: I55615b328bedf67819d076ccb21b9bc1f13a07a8