am 6665ae5e: am a48f431f: (-s ours) am 3ec4f550: Merge "libstagefright: fix overflow in pvdec_api.cpp." into mnc-dev

* commit '6665ae5e9306695cf37883554145d14060ae8728':