Merge "libstagefright: fix heap use after free issue" into tm-qpr-dev