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

Change-Id: I0070032c8334c24940167a8810108946c66cbd42