[automerger] Merge "stagefright: avoid buffer overflow in base64 decoder" into klp-dev am: 9e41bec8d3  -s ours am: c1e3b0cda0 am: f6ae88fdec am: 398d2167a0

Change-Id: Iba67f3a765f9398b8ce0c2b90aa13be1a9669ba7