Merge \"stagefright: fix possible stack overflow in AVCC reassemble\" into nyc-dev
am: 8ec880eb85

Change-Id: I6c5f20894a354a82421a72e6c3db6e11cb31b3eb