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

Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c am: 883b244f am: 31a3aa56 am: f1114192 am: 64149d75 am: 16f7ee09 am: f518e501 am: eb919fc1 am: 7e580879 am: a78d7f2d am: e47ede5c am: 361c6c42
am: 5fa6231e

* commit '5fa6231e':
  Fix security vulnerability in libstagefright

Change-Id: I7dde4ea7e6b3ce90240151ca09243e7a0fa4ecf2