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
am: d93213a338  -s ours

Change-Id: I3277b102636ff369794941198e342d6b74adebf0