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

Change-Id: I69bb1a049c80c45e6863e5064d8bb20c0c9a9d10