Revert "Revert "stagefright: Use multiaac decoder for multiaac :)""

This reverts commit 5e8ebe709371a19d731be6879ae33fc61638431e.

Change-Id: I40f3b0e4f7bfc9e8075912ee119e6fc1f0adf73f
Merge "Revert "Revert "stagefright: Use multiaac decoder for multiaac :)""" into kitkat
Revert "Revert "stagefright: Resolve turf war between FFMPEG and mm-parser""

This reverts commit 7a38dcc40b8d556792af9770db2952e9d2396d4f.

Change-Id: I2e357f9323de0a6fcd2e6645f2748223040c5b06
Merge "Revert "Revert "stagefright: Resolve turf war between FFMPEG and mm-parser""" into kitkat