Merge \\\\\\\\\\\"DO NOT MERGE stagefright: fix possible stack overflow in...

Merge \\\\\\\\\\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\\\\\\\\\" into lmp-dev am: 250935d1  -s ours am: 0db8fd31 am: ca08fe34 am: 622d070c  -s ours am: 27ebbf86 am: a8dc78e5 am: e9e6bd02 am: d93213a3  -s ours am: 630ac662 am: b4ef898b
am: 6f8e6186  -s ours

Change-Id: I2e1c86c80a9b41d00f5287d54dfb5c51803f10a9