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

Change-Id: I3c81cc13e267562ef130df62de2e531f6091e265