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

* commit 'eb919fc1d3005b2455f7ee31120da4ef5d292c43':
  Fix security vulnerability in libstagefright

Change-Id: I71aa4f5219134ad203fbe6c5122f29fd51445ae1