am aae3f86c: (-s ours) DO NOT MERGE: Fix build for libstagefright

* commit 'aae3f86c7c9a3bce5aab0d283343455d58b133b8':
  DO NOT MERGE: Fix build for libstagefright