Merge "MediaTesting: Add amr-nb Encoder Test"
am: d12ffdb77a

Change-Id: I5bf67f26f83607b67c0003ff3d51a4982d239d03