Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628
am: f11141924a

* commit 'f11141924a3b4208954bedf3dbeb9b7bfaab75c5':
  Fix security vulnerability in libstagefright

Change-Id: Ie56f84aae5d2d17a62932f3d2274978f82a34cd4