Merge "Remove AmrInputStream" am: 70b262b0f2
am: e57b37e423

Change-Id: Ia95832144e831b91ba0f163db1da8ef8e7033446