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 am: e47ede5c6b am: 361c6c4276
am: ded36eb69b

* commit 'ded36eb69baf12f63aa3374b1fcd5c3f72bd21e9':
  Fix security vulnerability in libstagefright

Change-Id: Iaa26d22522f686476f77ddbd750f825a18cf923a