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

* commit '883b244f4567fe0cd099f0583940e531eb0e2af4':
  Fix security vulnerability in libstagefright

Change-Id: Idd0798f74590e2546c4f0d1b0940ccf7e42f5a17