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

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: 68523c45
am: ad5881ab  -s ours

Change-Id: Ic0f011b0f0cbd5ea1334dbd5e50d7908110b5bf8