DO NOT MERGE: Fix build for libstagefright

Bug: 15987446
Change-Id: I6a13e1f73b067b733e2592e12ee21210d4c4d476
2 files changed