Revert "bacon: [HACK] Workaround for dynamic buffer issue"

 * The issues which caused the CTS fail and mediaserver crashes
   have been resolved.
 * For real this time :)

This reverts commit 960a82b9a0f5ffb6f8c14a4e022328baab8f6370.

Change-Id: Ie9591c41019963bda66217060df5a053fcbe5415
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0