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
am: a78d7f2d49

* commit 'a78d7f2d49d1d4ca2bf64e4f64ebcc16a008987b':
  Fix security vulnerability in libstagefright

Change-Id: I12f1c1c266ae15813bcc2b132b79d0fd8ddeab5c