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

Change-Id: Iea6d3d13c19f9121e7a505f89fa59e02b7cf7834