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 am: a0b2421e41 am: 5c7ed58364  -s ours am: bf592750d0 am: e8dd475879 am: 9f6b5dc900
am: 81e141f9d3  -s ours

Change-Id: I3cec6af5f01147ffd91ebfbda349e116eb21870a