Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev