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

* commit '16f7ee09b0ce814c7f45085b095c56ba44ba4133':
  Fix security vulnerability in libstagefright

Change-Id: I014e1098165beac42fbe08744911547eec5e16fe