Merge "Make AmrInputStream use MediaCodec" am: 866658261f am: 618c1a9ae6
am: fd91fcc970

Change-Id: Ib32029cce0ce9b7d6b0c51ad9a5e141b40a34304