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

Change-Id: I03203e4fdbe66aaa89aae54457cf334b71f676dc