Merge "MediaTesting: Add mp3Decoder Test" am: e55b684c7d am: 368d800d90

Change-Id: I8679cb6d886f1baaf1d18c3bbeaea60b6fcaba6f