stagefright: STEVE BUYS DONUTS

 * Unbreak the Hammerhead build.

Change-Id: I139a8a15d05c3b1bf8811b50a3d0b33292b0eb63
Merge branch 'cm-11.0' of git://github.com/CyanogenMod/android_frameworks_av into cm-11.0