Merge "MediaTesting: Add amr-nb Decoder Test" am: ebec92c224 am: b874cb0583

Change-Id: Ie3d59f9420cf8be2f21c26a6e2e585e3b4640256