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

Change-Id: I2f3e5b3b1e4451506e7c66ced8222137d504abdb