Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c59 am: 883b244f45 am: 31a3aa5628 am: f11141924a am: 64149d756a am: 16f7ee09b0 am: f518e50178 am: eb919fc1d3
am: 7e580879e0

* commit '7e580879e0b2c32b0d1e618c700da3040ceadb6b':
  Fix security vulnerability in libstagefright

Change-Id: Icb6285ea498c1d1060c374c2def53f3aa9d01946