Merge "Fix security vulnerability in libstagefright" into klp-dev