Revert "libstagefright: update headers"

This reverts commit 467efd1b23dcc0984e1d6bf3910d9dee3c07e580.
Merge remote-tracking branch 'hydra/cm-11.0' into cm-11.0-ion