Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\" into mnc-dev am: 77effe4be6
am: 25515c21b4

Change-Id: Ie724240ac720d27db1111361a8c0d170d4a6834a