Merge "fix AmrInputStream.read() hang" am: 5b6a02eb8b
am: 4c2bbbf552

Change-Id: I6764a29474ec9da78109e93c6a4f85ac3f8c2c1a