Merge "stagefright: fix possible stack overflow in AVCC reassemble" into nyc-dev