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

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

Change-Id: I3df7d187c5a2e73faadb74e4b1f9bbbf323586e3