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

Change-Id: If5f6b4b949911c9421172c90f45ede3f8d5fe27d