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

Change-Id: Id5830886ff3cc70e5adb7fc5c50c589c4c49e9f6