Merge "Fix security vulnerability in libstagefright" into klp-dev
am: eb37c37c59

* commit 'eb37c37c594604d0e6acbf14be6e04e065fab226':
  Fix security vulnerability in libstagefright

Change-Id: Icaecc46c13c06e6eff0167bbc1af4c580d161f62