Merge "Make AmrInputStream use MediaCodec" am: 866658261f am: 618c1a9ae6 am: fd91fcc970
am: 43cbb6bd6c  -s ours

Change-Id: Ia09fc733808e2f763675806a3469bfe8aec78d0d