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

* commit 'a48f431f7dd172e6cb5b6a8426098a5b1c485b4e':