Merge "Merge "Fix security vulnerability in libstagefright" into klp-dev am:...

Merge "Merge "Fix security vulnerability in libstagefright" into klp-dev am: eb37c37c am: 883b244f am: 31a3aa56 am: f1114192 am: 64149d75 am: 16f7ee09 am: f518e501 am: eb919fc1 am: 7e580879 am: a78d7f2d am: e47ede5c am: 361c6c42 am: ded36eb6" into nyc-mr1-dev-plus-aosp
am: 5ac24ba7

* commit '5ac24ba7':

Change-Id: Ib13ebcf032d5eb51c402c9d06217680d27a9b96a