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

Change-Id: Id5927f0f2e40412a8539d965751bb5d99cea8809