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

* commit '64149d756a3b32635247248419778631daf3e294':
  Fix security vulnerability in libstagefright

Change-Id: I114de4c4b430e9fd44d8204dd54db4abd5f29035