Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628 am: f11141924a am: 64149d756a am: 16f7ee09b0
am: f518e50178

* commit 'f518e501786c73675605365b829a174e5d5c17df':
  Fix security vulnerability in libstagefright

Change-Id: I5b6d66f369510e7e2f7378199a658ec1ec5e0a98