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

Change-Id: I8523a6a7220d1b6022965cd7df1b736b06aeee02