Merge \\\\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\\\" into mnc-dev am: 77effe4be6 am: 25515c21b4 am: 2728e0fe52 am: f667351d11  -s ours
am: 3a454cd276

Change-Id: I21d133c8262cdd71d8c072394f9568a89ae7ae8c