Merge remote-tracking branch 'hexene/stagefright'

* hexene/stagefright:
  libstagefright: fix build

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc tools/build_libstagefright
index ada8d4e,78c2084..78c2084
mode 100644,100755..100644
--- 1/tools/build_libstagefright
--- 2/tools/build_libstagefright
+++ b/tools/build_libstagefright