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

* commit '31a3aa56287d63aaf1ac804cc04154ed779032ff':
  Fix security vulnerability in libstagefright

Change-Id: I4d666e42bfc64e384b9fd8c8fad07d645be6a19a