Merge "DO NOT MERGE stagefright: fix possible stack overflow in AVCC reassemble" into klp-dev