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

Change-Id: I1fc5df6c606b357c59fca2dc90e716c5ce7d266c