Merge "AmrInputStream is not a public API" am: c3b1442d52
am: fa55320f5d

Change-Id: I44e4bbdb4919fa76bd47a25f4260ee943c9a6ecc