Merge \\"DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble\\" into lmp-dev am: 250935d18a  -s ours
am: 0db8fd31e1

Change-Id: Ib1aa01330422cc6b030e045bde785aa10e0cda96