Merge \\\\\\\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\\\\\\" into lmp-dev am: 250935d18a  -s ours am: 0db8fd31e1 am: ca08fe34fe am: 622d070c22  -s ours am: 27ebbf8625 am: a8dc78e5db
am: e9e6bd0237

Change-Id: Ifaf697534f84f188649d1b90f860c6ce85c9e4bd