Merge \\\\\\\\\\\\\"DO NOT MERGE stagefright: fix possible stack overflow in...

Merge \\\\\\\\\\\\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\\\\\\\\\\\" into klp-dev am: b239e274 am: cc3c5490 am: 19ca2d24  -s ours am: ef64984f  -s ours am: fe184469 am: a0b2421e am: 5c7ed583  -s ours am: bf592750 am: e8dd4758 am: 9f6b5dc9 am: 81e141f9  -s ours am: d7988a97
am: 23dc3d6f

Change-Id: Icb1a94a405928f77eb0962ecc7bf3985d3cbc0bf