Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC...
Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\" into klp-dev am: b239e274
am: cc3c5490
Change-Id: I772fba4484975a2f28fc947e4a16296b400f5a99