Bug 889763 - [MMS] Only image is received when sending image + audio file from android device. Co-author with gnarf37
(cherry picked from commit abead7bba3487268c81bafc6a0f9170fbdb1354b)