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

Change-Id: I3c51a12a8a52322f71654660e6023769c5024ec9