Merge \\\\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\\\" into klp-dev am: b239e27433 am: cc3c549065 am: 19ca2d2486  -s ours am: ef64984fe6  -s ours
am: fe184469d5

Change-Id: I9d419a11d17b23fc63ff441e67da089abde4cb5e