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

Change-Id: I9ae52293cb88b2697e4d059594bb05f420819a17