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

Change-Id: Ia99a5f14249a5f3cbcc6543533f5af128fe2ae85