am 9dcfe411: (-s ours) am 7c415afd: am 90be27c6: am 4c5695d8: am f248e3ae: am 8369ac13: am 33235986: am 09c29ec4: am 94c1969c: Merge "libstagefright: check memory size for overflow before allocation." into klp-dev

* commit '9dcfe4117c9f600396429b156a82bf22fcf477f0':